From c0275b508dab401f2464ec2beb26d9dde1779cf4 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 8 Jan 2016 01:37:20 +0100 Subject: [PATCH] Adwaita: fix calendar invisible selection --- gtk/theme/Adwaita/_common.scss | 5 +++-- gtk/theme/Adwaita/gtk-contained-dark.css | 14 ++++++++------ gtk/theme/Adwaita/gtk-contained.css | 14 ++++++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index d408f5c45a..ce734708e7 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2805,11 +2805,12 @@ calendar { border: 1px solid $borders_color; &:selected { - @extend .view:selected; + @extend %selected_items; + border-radius: 3px; } &.header { - border: 1px solid transparentize(black, 0.9); + border-bottom: 1px solid transparentize(black, 0.9); border-radius: 0; &:backdrop { border-color: transparentize(black, 0.9); } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 4878937b53..8a16d2a23e 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2992,7 +2992,7 @@ menu menuitem radio { .view.check, .view.radio, row .check, row .radio { -gtk-icon-shadow: none; } - .view.check:selected, calendar.check:selected, .view.check:hover, .view.radio:selected, calendar.radio:selected, .view.radio:hover, + .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover, row .check:selected, row .check:hover, row .radio:selected, row .radio:hover { -gtk-icon-shadow: none; } @@ -3910,8 +3910,10 @@ expander arrow { calendar { color: white; border: 1px solid #1c1f1f; } + calendar:selected { + border-radius: 3px; } calendar.header { - border: 1px solid rgba(0, 0, 0, 0.1); + border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-radius: 0; } calendar.header:backdrop { border-color: rgba(0, 0, 0, 0.1); } @@ -4563,20 +4565,20 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, .view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label:selected, label selection, label selection:focus, label selection:hover, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, -.menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { +.menuitem.button.flat:selected, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected { background-color: #215d9c; color: #ffffff; } textview text selection:disabled, .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected, label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected, - .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { + .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { color: #90aece; } textview text selection:backdrop, .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, - .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { + .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:disabled, .view selection:backdrop:disabled, iconview:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected, label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, - .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { + .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { color: #648eba; } .monospace { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index c075f6c868..0de639e335 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -3154,7 +3154,7 @@ menu menuitem radio { .view.check, .view.radio, row .check, row .radio { -gtk-icon-shadow: none; } - .view.check:selected, calendar.check:selected, .view.check:hover, .view.radio:selected, calendar.radio:selected, .view.radio:hover, + .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover, row .check:selected, row .check:hover, row .radio:selected, row .radio:hover { -gtk-icon-shadow: none; } @@ -4080,8 +4080,10 @@ expander arrow { calendar { color: black; border: 1px solid #9d9d99; } + calendar:selected { + border-radius: 3px; } calendar.header { - border: 1px solid rgba(0, 0, 0, 0.1); + border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-radius: 0; } calendar.header:backdrop { border-color: rgba(0, 0, 0, 0.1); } @@ -4735,21 +4737,21 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, .view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label:selected, label selection, label selection:focus, label selection:hover, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, -.menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { +.menuitem.button.flat:selected, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } textview text selection:disabled, .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected, label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected, - .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { + .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { color: #a5c8ec; } textview text selection:backdrop, .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, - .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { + .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:disabled, .view selection:backdrop:disabled, iconview:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected, label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, - .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { + .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { color: #80b1e4; } .monospace { -- 2.30.2